Merge tag 'upstream/1.7.1'
authorLeopold Palomo <leopold.palomo@upc.edu>
Thu, 3 Apr 2014 14:16:05 +0000 (16:16 +0200)
committerLeopold Palomo <leopold.palomo@upc.edu>
Thu, 3 Apr 2014 14:16:05 +0000 (16:16 +0200)
commit5296e0da5a994f81465ac8c34c4be286da821bcc
tree3db7e0cd7e4f96fa26b64d457b86c5895524304c
parent0f2b64482c1160816b1d13ceaa5943f873ff614e
parent90d88ddb0aa52085ec972a9964afe21f77bb1609
Merge tag 'upstream/1.7.1'

Upstream version 1.7.1